diff --git a/CHANGELOG b/CHANGELOG
index b377507..7c2bdab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,10 @@
   ethernet port on ebony.
   Patch by Stefan Roese, 7 Sep 2005
 
+* Added support for mtddevnum and mtddevname variables (mtdparts command)
+
+* Change default console baud rate for stxxtc board
+
 * Add I2C support to TQM8540 and TQM8560 boards (EEPROM, RTC, LM75-DTT).
   Patch by Stefan Roese, 31 Aug 2005
 
diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index 7ab6e9c..fda0c95 100644
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -238,6 +238,46 @@
 }
 
 /**
+ * This routine does global indexing of all partitions. Resulting index for
+ * current partition is saved in 'mtddevnum'. Current partition name in
+ * 'mtddevname'.
+ */
+static void index_partitions(void)
+{
+	char buf[16];
+	u16 mtddevnum;
+	struct part_info *part;
+	struct list_head *dentry;
+	struct mtd_device *dev;
+
+	DEBUGF("--- index partitions ---\n");
+
+	if (current_dev) {
+		mtddevnum = 0;
+		list_for_each(dentry, &devices) {
+			dev = list_entry(dentry, struct mtd_device, link);
+			if (dev == current_dev) {
+				mtddevnum += current_partnum;
+				sprintf(buf, "%d", mtddevnum);
+				setenv("mtddevnum", buf);
+				break;
+			}
+			mtddevnum += dev->num_parts;
+		}
+
+		part = jffs2_part_info(current_dev, current_partnum);
+		setenv("mtddevname", part->name);
+
+		DEBUGF("=> mtddevnum %d,\n=> mtddevname %s\n", mtddevnum, part->name);
+	} else {
+		setenv("mtddevnum", NULL);
+		setenv("mtddevname", NULL);
+
+		DEBUGF("=> mtddevnum NULL\n=> mtddevname NULL\n");
+	}
+}
+
+/**
  * Save current device and partition in environment variable 'partition'.
  */
 static void current_save(void)
@@ -260,6 +300,7 @@
 
 		DEBUGF("=> partition NULL\n");
 	}
+	index_partitions();
 }
 
 /**
@@ -398,6 +439,8 @@
  */
 static int part_del(struct mtd_device *dev, struct part_info *part)
 {
+	u8 current_save_needed = 0;
+
 	/* if there is only one partition, remove whole device */
 	if (dev->num_parts == 1)
 		return device_del(dev);
@@ -414,20 +457,23 @@
 			if (curr_pi == part) {
 				printf("current partition deleted, resetting current to 0\n");
 				current_partnum = 0;
-				current_save();
 			} else if (part->offset <= curr_pi->offset) {
 				current_partnum--;
-				current_save();
 			}
+			current_save_needed = 1;
 		}
 	}
 
-
 	jffs2_free_cache(part);
 	list_del(&part->link);
 	free(part);
 	dev->num_parts--;
 
+	if (current_save_needed > 0)
+		current_save();
+	else
+		index_partitions();
+
 	return 0;
 }
 
@@ -469,6 +515,8 @@
 	if (list_empty(&dev->parts)) {
 		DEBUGF("part_sort_add: list empty\n");
 		list_add(&part->link, &dev->parts);
+		dev->num_parts++;
+		index_partitions();
 		return 0;
 	}
 
@@ -492,18 +540,23 @@
 
 		if (new_pi->offset <= pi->offset) {
 			list_add_tail(&part->link, entry);
+			dev->num_parts++;
 
 			if (curr_pi && (pi->offset <= curr_pi->offset)) {
 				/* we are modyfing partitions for the current
 				 * device, update current */
 				current_partnum++;
 				current_save();
+			} else {
+				index_partitions();
 			}
-
 			return 0;
 		}
 	}
+
 	list_add_tail(&part->link, &dev->parts);
+	dev->num_parts++;
+	index_partitions();
 	return 0;
 }
 
@@ -524,7 +577,6 @@
 	if (part_sort_add(dev, part) != 0)
 		return 1;
 
-	dev->num_parts++;
 	return 0;
 }
 
@@ -735,9 +787,10 @@
 			current_partnum = 0;
 		}
 		current_save();
+		return 0;
 	}
 
-
+	index_partitions();
 	return 0;
 }
 
@@ -771,13 +824,20 @@
  */
 static void device_add(struct mtd_device *dev)
 {
+	u8 current_save_needed = 0;
+
 	if (list_empty(&devices)) {
 		current_dev = dev;
 		current_partnum = 0;
-		current_save();
+		current_save_needed = 1;
 	}
 
 	list_add_tail(&dev->link, &devices);
+
+	if (current_save_needed > 0)
+		current_save();
+	else
+		index_partitions();
 }
 
 /**
@@ -896,7 +956,7 @@
 	}
 	memset(dev, 0, sizeof(struct mtd_device));
 	dev->id = id;
-	dev->num_parts = num_parts;
+	dev->num_parts = 0; /* part_sort_add increments num_parts */
 	INIT_LIST_HEAD(&dev->parts);
 	INIT_LIST_HEAD(&dev->link);
 
@@ -1548,7 +1608,7 @@
 		ids_changed = 1;
 
 		if (parse_mtdids(ids) != 0) {
-			device_delall(&devices);
+			devices_init();
 			return 1;
 		}
 
diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index a0e1ba7..f6e6a60 100644
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -42,7 +42,7 @@
 #undef	CONFIG_8xx_CONS_SMC2
 #undef	CONFIG_8xx_CONS_NONE
 
-#define CONFIG_BAUDRATE		38400	/* console baudrate = 38.4kbps	*/
+#define CONFIG_BAUDRATE		115200	/* console baudrate = 115.2kbps	*/
 
 #define CONFIG_XIN		10000000	/* 10 MHz input xtal */